bitkeeper revision 1.1235 (421b41aazjnSo8DpSfrNQiqgpP1Dmw)
authormaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Tue, 22 Feb 2005 14:28:58 +0000 (14:28 +0000)
committermaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Tue, 22 Feb 2005 14:28:58 +0000 (14:28 +0000)
Merge burn.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into burn.cl.cam.ac.uk:/local/scratch-1/maf46/xen-unstable.bk

Signed-off-by: michael.fetterman@cl.cam.ac.uk

Trivial merge